Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update default version #9916

Merged
merged 5 commits into from
Jan 25, 2020
Merged

Conversation

sapk
Copy link
Member

@sapk sapk commented Jan 21, 2020

I know that the version is generate in makefile but it would be good to keep it up-to-date from time to time.

Related #9913

@sapk sapk added type/miscellaneous skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jan 21, 2020
@sapk sapk added this to the 1.12.0 milestone Jan 21, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 21, 2020
main.go Outdated
@@ -29,7 +29,7 @@ import (

var (
// Version holds the current Gitea version
Version = "1.9.0-dev"
Version = "1.12.0-dev"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better if we have this set to 0.0.0-dev, as we have our makefile override this, and then we could also distinguish better when the binary is built via go build without version info passedin.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-dev is already specific to direct build ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or maybe have it blank like the below variables?

@6543
Copy link
Member

6543 commented Jan 21, 2020

@techknowlogick we had this topic before ... #8686

@techknowlogick
Copy link
Member

@6543 I just don't think this should have to be kept up to date, as makefile already gives us the info. Having it be a non version would prevent users from being confused when we don't update this line.

My opinion is still the same as the other PR you made.

@sapk
Copy link
Member Author

sapk commented Jan 21, 2020

Maybe it is time for a vote ?

  • 👍 empty
  • 👎 updated version (or at least from time to time)
  • 😄 0.0.0-dev
  • 🎉 develop
  • 😕 leave as it is
  • ❤️ development
  • 🚀 unknown

(emojis are just listed by order and doesn't means anythings)

Edit: add development
Edit: add unknown

@codecov-io
Copy link

codecov-io commented Jan 21, 2020

Codecov Report

Merging #9916 into master will not change coverage.
The diff coverage is 43.96%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #9916   +/-   ##
=======================================
  Coverage   42.27%   42.27%           
=======================================
  Files         610      610           
  Lines       80370    80370           
=======================================
  Hits        33978    33978           
- Misses      42208    42210    +2     
+ Partials     4184     4182    -2
Impacted Files Coverage Δ
models/models.go 61.71% <ø> (ø) ⬆️
services/pull/commit_status.go 5.19% <ø> (ø) ⬆️
routers/repo/http.go 38.75% <ø> (ø) ⬆️
routers/repo/setting.go 14.99% <ø> (ø) ⬆️
modules/migrations/base/downloader.go 26.66% <ø> (ø) ⬆️
routers/repo/view.go 39.47% <ø> (ø) ⬆️
routers/repo/repo.go 30.02% <ø> (ø) ⬆️
routers/api/v1/user/key.go 67.26% <ø> (ø) ⬆️
routers/api/v1/user/follower.go 0% <ø> (ø) ⬆️
routers/repo/issue_label.go 42.18% <ø> (ø) ⬆️
... and 192 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6ac6097...376c0e4. Read the comment docs.

@6543
Copy link
Member

6543 commented Jan 21, 2020

@go-gitea/maintainers vote: #9916 (comment)

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 21, 2020
Copy link
Member

@techknowlogick techknowlogick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blocked until vote is over

@lunny
Copy link
Member

lunny commented Jan 21, 2020

The version is some meaning when you download the tar zip source file. Because there is no git commit information to let you know what's the version of this source copy.

@techknowlogick
Copy link
Member

What @lunny has said makes sense. I've taken away my block.

@jolheiser
Copy link
Member

Based on the related issue I would actually argue against updating this value unless we plan on doing so for every release.
I personally think this string should make it entirely clear that a build made without the link flags is not indicative of the actual version.

main.go Outdated Show resolved Hide resolved
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion

@guillep2k
Copy link
Member

How about "built from sources", "please build using make" or "don't bother, it's not relevant" 🤣

No, really, some text that implies that it was built outside of the normal build flow.

@techknowlogick
Copy link
Member

@guillep2k that’s why I had suggested 0.0.0-dev previously

@sapk
Copy link
Member Author

sapk commented Jan 21, 2020

The -dev flag imply that it was build without make.
I wasn't intending to fire up such a debat (sorry) but the vote will clear this one for all and it seems to be "develop" the winner for now.

I think it is good to close some old debat that was put aside and clear them by a vote by maintainers and not stay with a status quo.

Co-Authored-By: 6543 <6543@obermui.de>
main.go Outdated Show resolved Hide resolved
@davidsvantesson
Copy link
Contributor

@guillep2k Maybe set to something ironic, like "did-you-make-it?"

@tboerger
Copy link
Member

For drone plugins im setting it to unknown by default

sapk and others added 2 commits January 25, 2020 13:33
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
@6543
Copy link
Member

6543 commented Jan 25, 2020

@sapk is core not chore or ?

@sapk
Copy link
Member Author

sapk commented Jan 25, 2020

I used chore: for a non essential code change like https://www.conventionalcommits.org/en/v1.0.0/

@zeripath zeripath merged commit c6edb25 into go-gitea:master Jan 25, 2020
@sapk sapk deleted the updt-version branch January 26, 2020 16:52
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
@wxiaoguang
Copy link
Contributor

I believe we need to set AppVer to valid version string now.

See:

Or, is there any better way to avoid AppVer appearing in many unit tests?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/miscellaneous
Projects
None yet
Development

Successfully merging this pull request may close these issues.